Merge branch 'master' of git://git.denx.de/u-boot-ti
authorWolfgang Denk <[email protected]>
Thu, 9 Sep 2010 17:55:02 +0000 (19:55 +0200)
committerWolfgang Denk <[email protected]>
Thu, 9 Sep 2010 17:55:02 +0000 (19:55 +0200)

Trivial merge